Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:18:28 +0000 (12:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:18:28 +0000 (12:18 -0700)
commit3da27391bbaac09964478c7e312bb6a76dfce4a8
treef6dc4c67d932819fd761f7f7cac4cd2340488365
parentd306c7c86f14761297561ece36c76009b9b44e31
parentddb657f1aa16cb6dd9c7ab8769bdea2a746d3805
Merge from trunk.
src/ChangeLog
src/emacs.c
src/print.c